Rever tiger back to C version. It isn't *really* a CSV after all.

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index 3d4294a4a1e6647d23bdc044a7dc477d95b06211..81de1b0f4cdc925584d461c07586e9bf48f06034 100644 (file)
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -5,7 +5,7 @@ INSTALL_TARGETDIR=/usr/local/
 FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o \
        gpsutil.o pcx.o cetus.o gpspilot.o magnav.o \
        psp.o holux.o garmin.o tmpro.o tpg.o \
-       xcsv.o gcdb.o internal_styles.o
+       xcsv.o gcdb.o tiger.o internal_styles.o
 
 FILTERS=position.o duplicate.o
 
@@ -58,8 +58,8 @@ dep:
        (echo "internal_styles.c: mkstyle.sh" ; ls style/*.style) >> /tmp/dep
        echo Edit Makefile and bring in /tmp/dep
 
-VERSIONU=1_1_1_beta03022003
-VERSIOND=1.1.1_beta03022003
+VERSIONU=1_1_1_beta03072003
+VERSIOND=1.1.1_beta03072003
 release:
        rm -fr gpsbabel-$(VERSIOND)
        cvs tag gpsbabel_$(VERSIONU)

diff --git a/gpsbabel/internal_styles.c b/gpsbabel/internal_styles.c
index c12c909e499240253b2e58e97e0f3d576a15dff8..d86d468132359a3e372909630b2f4a36612b733d 100644 (file)
--- a/gpsbabel/internal_styles.c
+++ b/gpsbabel/internal_styles.c
@@ -346,34 +346,6 @@ static char s_and_t[] =
 "IFIELD        URL, \"\", \"%s\"                       # URL\n"
 "IFIELD        IGNORE, \"\", \"\"                      # Holder for Geocache Type\n"
 ;
-static char tiger[] = 
-"# gpsbabel XCSV style file\n"
-"#\n"
-"# Format: Tiger Data Format\n"
-"# Author: Alex Mottram\n"
-"#   Date: 12/09/2002\n"
-"#\n"
-"# \n"
-"# As defined in tiger.c\n"
-"#\n"
-
-"DESCRIPTION           U.S. Census Bureau Tiger Mapping Service\n"
-
-"#\n"
-"# FILE LAYOUT DEFINITIIONS:\n"
-"#\n"
-"FIELD_DELIMITER               COLON\n"
-"RECORD_DELIMITER      NEWLINE\n"
-"BADCHARS              COLON\n"
-
-"#\n"
-"# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:\n"
-"#\n"
-"IFIELD        LON_DECIMAL, \"\", \"%f\"\n"
-"IFIELD        LAT_DECIMAL, \"\", \"%f\"\n"
-"IFIELD        CONSTANT, \"redpin\", \"%s\"\n"
-"IFIELD        DESCRIPTION, \"\", \"%s\"\n"
-;
 static char xmap[] = 
 "# gpsbabel XCSV style file\n"
 "#\n"
@@ -404,37 +376,5 @@ static char xmap[] =
 "IFIELD        LON_DECIMAL, \"\", \"%08.5f\"\n"
 "IFIELD        DESCRIPTION, \"\", \"%s\"\n"
 ;
-static char xmapwpt[] = 
-"# gpsbabel XCSV style file\n"
-"#\n"
-"# Format: Delorme Xmap HH Street Atlas USA .WPT (PocketPC)\n"
-"# Author: Alex Mottram\n"
-"#   Date: 12/09/2002\n"
-"#\n"
-"# \n"
-"DESCRIPTION           Delorme XMat HH Street Atlas USA .WPT (PPC)\n"
-"SHORTLEN              32\n"
-"SHORTWHITE            0\n"
-
-"#\n"
-"#\n"
-"# FILE LAYOUT DEFINITIIONS:\n"
-"#\n"
-"FIELD_DELIMITER               COLON\n"
-"RECORD_DELIMITER      NEWLINE\n"
-"BADCHARS              COLON\n"
-
-"#\n"
-"# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:\n"
-"#\n"
-"IFIELD        CONSTANT, \"1296126539\", \"%s\"\n"
-"IFIELD        CONSTANT, \"1481466224\", \"%s\"\n"
-"IFIELD        LAT_INT32DEG, \"\", \"%d\"\n"
-"IFIELD        LON_INT32DEG, \"\", \"%d\"\n"
-"IFIELD        CONSTANT, \"3137157\", \"%s\"\n"
-"IFIELD        SHORTNAME, \"\", \"%-.31s\"\n"
-"IFIELD        IGNORE, \"\", \"%-.31s\"\n"
-"IFIELD        DESCRIPTION, \"\", \"%-.78s\"\n"
-;
 #include "defs.h"
-style_vecs_t style_list[] = {{ "xmapwpt", xmapwpt } , { "xmap", xmap } , { "tiger", tiger } , { "s_and_t", s_and_t } , { "ozi", ozi } , { "nima", nima } , { "mxf", mxf } , { "gpsman", gpsman } , { "gpsdrive", gpsdrive } , { "dna", dna } , { "custom", custom } , { "csv", csv } ,  {0,0}};
+style_vecs_t style_list[] = {{ "xmap", xmap } , { "s_and_t", s_and_t } , { "ozi", ozi } , { "nima", nima } , { "mxf", mxf } , { "gpsman", gpsman } , { "gpsdrive", gpsdrive } , { "dna", dna } , { "custom", custom } , { "csv", csv } ,  {0,0}};

diff --git a/gpsbabel/style/tiger.style b/gpsbabel/style/tiger.style
deleted file mode 100644 (file)
index cf522b6..0000000
--- a/gpsbabel/style/tiger.style
+++ /dev/null
@@ -1,26 +0,0 @@
-# gpsbabel XCSV style file
-#
-# Format: Tiger Data Format
-# Author: Alex Mottram
-#   Date: 12/09/2002
-#
-# 
-# As defined in tiger.c
-#
-
-DESCRIPTION            U.S. Census Bureau Tiger Mapping Service
-
-#
-# FILE LAYOUT DEFINITIIONS:
-#
-FIELD_DELIMITER                COLON
-RECORD_DELIMITER       NEWLINE
-BADCHARS               COLON
-
-#
-# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:
-#
-IFIELD LON_DECIMAL, "", "%f"
-IFIELD LAT_DECIMAL, "", "%f"
-IFIELD CONSTANT, "redpin", "%s"
-IFIELD DESCRIPTION, "", "%s"

diff --git a/gpsbabel/vecs.c b/gpsbabel/vecs.c
index bb2c74e2a04fab2588bca7ee126d24f5d67f712b..9db8180ee2cec9f870ea19d94853cca8f7dc8526 100644 (file)
--- a/gpsbabel/vecs.c
+++ b/gpsbabel/vecs.c
@@ -36,6 +36,7 @@ extern ff_vecs_t mag_vecs;
 extern ff_vecs_t mapsend_vecs;
 extern ff_vecs_t mps_vecs;
 extern ff_vecs_t gpsutil_vecs;
+extern ff_vecs_t tiger_vecs;
 extern ff_vecs_t pcx_vecs;
 extern ff_vecs_t cetus_vecs;
 extern ff_vecs_t gpspilot_vecs;
@@ -153,8 +154,13 @@ vecs_t vec_list[] = {
                "Geocaching Database", 
                NULL
        },
-
-        {
+       {
+               &tiger_vecs,
+               "tiger",
+               "U.S. Census Bureau Tiger Mapping Service",
+               NULL
+       },
+       {
                NULL,
                NULL,
                NULL,